Merge version 5.15.16-3.1+rpi1 and 5.15.16-4 to produce 5.15.16-4+rpi1

diff --cc debian/changelog
index 0d222752cd50b83132b3d0ced8b72f67b56a67d1,72fcb0c6452fa7a008071a95720dc57abc8c2812..eadaafaea708f672c6f6953b80020e1549e518ca
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,18 -1,14 +1,30 @@@
- pyside2 (5.15.16-3.1+rpi1) trixie-staging; urgency=medium
++pyside2 (5.15.16-4+rpi1) forky-staging; urgency=medium
 +
 +  [changes brought forward from 5.11.2-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sun, 23 Dec 2018 23:25:45 +0000]
 +  * Remove armhf from qtwebengine architecture lists.
 +  * Fix clean target.
 +
 +  [changes introduced in 5.13.2-3+rpi1 by Peter Michael Green]
 +  * Disable testsuite.
 +
 +  [changes brought forward from 5.15.2-2+rpi2 by Peter Michael Green <plugwash@raspbian.org> at Sat, 05 Feb 2022 15:09:17 +0000]
 +  * Add build-conflicts on libshiboken2-dev
 +  * Improve replacement rules for paths
 +    (still not ideal)
 +
-  -- Raspbian forward porter <root@raspbian.org>  Sat, 08 Feb 2025 00:05:15 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Wed, 14 Jan 2026 12:38:37 +0000
++
+ pyside2 (5.15.16-4) unstable; urgency=medium
+ 
+   [ Dmitry Shachnev ]
+   * Revert making tests non-fatal on ppc64el.
+ 
+   [ Gianfranco Costamagna ]
+   * Add two upstream patches for cmake 4.0 (Closes: #1113433)
+     - a17f4a90b1af174b38b839fc1b5bc0e933ad1725.patch
+     - ea351c5d53e34d3d1daf71de5eb73ba6e03e552a.patch
+ 
+  -- Gianfranco Costamagna <locutusofborg@debian.org>  Fri, 03 Oct 2025 17:43:00 +0200
  
  pyside2 (5.15.16-3.1) unstable; urgency=medium
  

diff --cc debian/rules
index 00ea812875689a2c9d5a245e742ca287767dafc0,e859103ea0fffd834296699efe0e569731599fcf..5806ec0dee6e8b15e2b27e71986b498dba3ae9a5
--- 1/debian/rules
--- 2/debian/rules
+++ b/debian/rules
@@@ -52,19 -52,12 +52,19 @@@ override_dh_install-arch
        # not what we need
        debian/set-paths
  
 +override_dh_auto_clean:
 +      dh_auto_clean
 +      rm -rf pyside_package pyside?_build pyside?_install
 +      rm -f sources/pyside2/doc/qtmodules/*.qdocconf sources/pyside2/doc/pyside-config.qdocconf sources/pyside2/doc/pyside.qdocconf.in
 +      find . -name *.qdoconf -delete
 +      rm -f build_history/*/build_dir.txt
 +
  override_dh_auto_test:
- ifneq (,$(filter $(DEB_HOST_ARCH), mips64el ppc64el))
+ ifeq (mips64el,$(DEB_HOST_ARCH))
        # See https://bugs.debian.org/868745, https://bugs.debian.org/1061679
 -      -QSG_NO_DEPTH_BUFFER=1 xvfb-run -a dh_auto_test -- --system=custom \
 -              --test-args '{interpreter} testrunner.py test'
 +      #-QSG_NO_DEPTH_BUFFER=1 xvfb-run -a dh_auto_test -- --system=custom \
 +      #       --test-args '{interpreter} testrunner.py test'
  else
 -      xvfb-run -a dh_auto_test -- --system=custom \
 -              --test-args '{interpreter} testrunner.py test'
 +      #xvfb-run -a dh_auto_test -- --system=custom \
 +      #       --test-args '{interpreter} testrunner.py test'
  endif